Lot Bugs fixed (still in Dev.)