Peformance tweaking, new library builds