Work on troll hell, update library, cleanup