some small fixes and prep for atom build method