master [fixing bugs]