Most important TODO's done

Bug with in-game options fixed