Removed logging from library; minor bugfixes