lots of little changes to get ready for final version for production