Some cleaning up and more testing. Looks good.