RSSIRecorder - Tidying up. Bug fixes