CHANGE: little fixes and add ToDo's...please read;)