added configuration
serveral changes
minor change
cleanup

removed dead / commented code fragments