Moar bugfixes
Revert back to revision 0
Updates