rest of changes, hopefully small ones