Completed some items on the priority todo list ^^