tested on amigo - fix homing and merge to master