Menu command disabled by default on VS startup + some other minor changes.