fixed the add remove issue,  general tidy up and started work on
configuration