Fixes #21 and adds more options to /metropolis