Fixed a few things and Commented