Adding noop & disabled and fixing a couple small bugs