updated various files
more modifications