added TODO list
small changes and fixes