Fixed --watch and changed normalize to partial