fixed some citations + cleanup on parameter optimization