Fixing some Bugs 1-27-13 5:00PM