Fixed some messy-ness.
Merge branch 'trunk'