General

Basic update and improvements to the library