! add limits to validation test, plus fix some bugs

Signed-off-by: Spuds <spuds@spudsdesign.com>