Mvp 1556

fix errors that arose during testing