Add/Fix Chisel microblocks

Updated for Chisel 2