added comments, removed some code for current version