update libs
minor code cleanup