catkinized and some tweaks