Fixed a TON of bugs—more to be fixed