Print and other tweaks (#381)