Functional fixes/cleanup

Goodie!  Done!