updated libraries
updated libraries, adapted code
improved naming, cleanup