fixed a few trivial issues