updates from local

 - untested changes though!