Changes

I have made a few changes, so hopefully I managed to correct the problem I had with posting comments.