Minor bug fixes + comment additions