pushing up changes and comment cleanup, extra credit WIP