updated smartswitch at end of beta
proofreading