minor changes, improvements