Refactor parameter handling, improve starting values