Merge Fixes
Cleaned up some formatting
Merge pull request #29 from sherakama/3xb

Cleaned UP 2.x Autopop pull request