Updates and fixes

Corrections to program