Removed the codensiffers and detectors to keep it simple, fixed a bunch of minor issues
merge