Cleaned up a lot, and did a lot more testing