fixes and cleanups
Use commentbox from pe