takes care of some remaining deployment issues and closes #23