small changes (mainly comments)
small changes, not working