Deleted old code, added/removed various comments.