minor changes and enhancements

No comment should have more than 80 characters in any line :)