working towards final commit, more housecleaning