minor changes hat will probably get redone in a second....