few minor changes for public