Final Bugs Fixed
Merge remote-tracking branch 'origin/local_Jim'