updates , fixing bugs