short 6 portalling, some caulking, cleanup