Removed a couple outdated comments.
Moved stuff back