fixed a few things...more to go tomorrow