Works OK now

Playing around with all the parameters a lot...