getting rid of several bugs