fixing bugs and remote