Tidied up some more signals and slots