comments added, bug in changing model fixed ...