Fixed some more bugs. Changed a few minute style things.