Removed string checking in favor of simple math checks, along with some cleanup.
Updating distro