several updates, need to rethink a few items