Bug fixes, minor changes, plus shop work