more docs, bugfixes
Cleared up some stuff together with nmjesus