no really... yet another major refactoring!
fixes + first doc