More Fixes for Mecha. Almost done for board