more small changes
stable version