Made things more consistent and some more explanations. Ready for activator!