more bug fixes

more bug fixes

Signed-off-by: Robert Coscia <coscia@g.harvard.edu>
various fixes

various fixes & enhancements

Signed-off-by: Robert Coscia <coscia@g.harvard.edu>