More Comment Changes, and new feature stuff.