cleaned up names + deps
global switch
try