several smaller updates