Minor Bug Fix and Corrections