minor updates, fixes
minor updates