updates copied over from bauhaus 1.4.4