Nearly done, bugtesting and making things pretty