Cleaned up names a bit, removed warnings, and removed unneeded sleeps.