Bundle comments and cleanup. Add tern
Options like unimpaired and some more