Libraries (10%)

clean ups and stuff