several smaller and medium sized improvements