Fixed Some Bugz