CONTINUED board generalizations
SMALL fixes