maxvonhippel bug fixes and small changes