Edited classes to mirror uzyn's original library (latest commit)