fixing bugs and shit