small improvements, prep for larger ones