More tweaks to tileset + support for Block, BGO and NPC