adjusted parameters
adjusted some parameters; tweaked things
merged