slight clean-up
merging stuff from remote