Documentation, fix
Moar bug fixes