Fixed a bug and finished comments