Fixed some comments
Added params