SO many changes

And i have to commit them before I can sync...
Fixed crash.