put properties and made the parameter adjustments more robust, looks quite good I find