Pushing some unpolished changes

Doing this generally to keep the branch up to date