fixing bugs
almost done!