Improved comments. Got rid of warnings