lots of updates and additions