Removed warnings, fixed comments