cleaned up a bit, and did some small changes