fixed MMAAAAAAD BUGS
Merge branch 'fixing-bugs'