fixing bugs estimotes