slight modifications and bug fixes for actual deployment that have not
been caught up with in the repository