Features, bugs and ToDo added