Feature/updates

testing cleanup