bunch of changes 4/16