Fixing bugs
More bugs