some small changes
Still working on library