Lots of bugs fixed, cleaned up things, looks a lot more like tetris :D