discussed changes, consistency vals, table caps
copied from dropbox
merged