more support, minor tweaks after first print