bug fixing and new default values
bug fixes and incremental changes