Minor fixes, save up commit. No known bugs.