catkinized with 65cecf44adb99106783d2206cbb745b40e0d258f
tweaks to catkinization