moved some todo items to Issues
added some more comments