Misc changes, commit before work