Various changes

Various changes

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