made everything simpler; removed alot of junk code