Small changes, getting ready for test deploy