Merging all dev features to master

Everythink works, or at least doesnt make it worse ;)