Added switch~ objects and tidied stuff up