Fixing bugs, almost done