Made various changes. Making it pretty.