[*] Changes to default paramters, minor adjustments