a bunch of updates and additions