Minor parameter updates. Seems to work well now.