- clean up and fixing slugs