some qol stuff done,
test coverage still remains