removed some name clashes, explicit calculation of steric factors