too much changes to diff. gonna do good commits in future. I swear :P
fixed conflicts oO