Added some of the changes done during LD29