More bug fixes + comments