Bugfixing restart function
Adding more to the todo list