updates to structure overall, a few other changes scattered