updates from https://github.com/guns/haus