bugfix and rename
pushed old comments into a file, and made some other minor changes