Added second tileset, fixed bugs, updated cli.