bugs fixed final version

version ready to turn in