fixing little bugs and stuff