some tweaks and new files to get detergent working