World now taken as parameter to solve()
Comment touchups