final run, some minor improvements