Final changes, comments were added to files