Fixed some bugs

Signed-off-by: JSatterf1579 <joseph.satterfield@case.edu>