Multiple bug fixes, additional libraries