Removed comments and fixed a few things.