small changes, ready for initial deployment