bunch of most recent modifications