structure limits & minor fixes