fixing some obvious issues here
tests passing now