small updates for basic structure