More minor changes. Submitted to VAK web-site