Disabling non-complete features, fixing bugs