minor fixes + comments/ code clean up