just some general improvements I think