updates to supporting classes
cleanup