comment cleanups/additions