adding cornify and cleaning up options