several improvements
minor changes