FunkyBot: Various improvements