more complete params watching, less magic numbers