Added walle and tron. Also fixed the block type issues