06 & 07 update to comments, clean, etc