minnor improvements