Quickfix

Quick fixes based on notes taken during initial deployment.