fixed few errors on the library repository, had to make some changes here
as well.