Removed warning, fixed some comments