Commented, ToDo, minor changes