code improvements + robo tests