minor fixes and new parameters