Fixes and tidy up
Need to move fd relations about