fixing bugs and coding