greetings...

perhaps it's worth making the distinction between simple "kink" in the bedroom and lifestyle things?

Is it worth considering the Dominant and submissive role as opposed to being a top and bottom. For pure sexual scenes I would suggest that Top and bottom may be more appropriate. That way at least when you move into the realms of D/s as opposed to kink you can differentiate between the roles.

In your section about safewords I would also add that a top/dominant is also at will to use a safeword. Sometimes it is more incumbent on them than the bottom/sub to do so, as they may be in more of a position of choice.

regards

MG