more tests added and some state clean up added, amended readme