small updates and restructs