misc updates from seaworthy