Fixed Several Bugs - for real.