moved comments
tidied up some setfs
renamed symbol