octopi: Making it work a bit better (WIP)