Final fixes

All working and tested