small updates to shell switch