Catchup to current

haven't been commiting this month. This catches up the repo to all work done.