Tidy up of Avalon monitor, fix for missing optional signals