Updated init mechanism
Tweak docs