Perpare for work :)

~ Fixing basic things
+ better performance