Fixed numerous bugs - ready to deploy on staging