Revamped libraries some
Resolved previous commit issues.