Added username support
Increased circle point count
Cleaned up some code
Other minor improvements