Minor tidying and documentation
Minor cleanup & fixes for buoy stuff