Remove bugs and stuff :D
Fixes and tweakz