adds some general improvements