Fixed Several Errors