Added several features to help fix the number-restraint problem...not successful, but progress was made.