fixes during test, need to look at these again