Sync; minor cleanup of main, plus pulling in fixes