First fix
second fix.. all done
some additional work done too