Autocal work

further work done on autocal