more fixes, changes, and additions