Added several switches and stuff