Changed and added a few things
(Not much work left :D)