added Libraries, some cleanup