Fixed pause bug, small improvements and... removing stuff.