Funkybot improvements