Minor fixes, added class comment descriptions