Tidying up and bug fixes
Tidying up and bug fixes