Moved some stuff, minor changes.
Minor improvements.