Fixed bug
More bugs fixed