adjustments & bug fixes