Still fixing bugs