Bit's of clean up. Fixed shout refresh not working.