misc updates

moving on to merging this branch with the master to push my updates