misc changes, made a few of the changes from Dad