few changes

modified bits and pieces