made a few changes...will work on more