PSR2 & FIX SOME COMMENTS