Re-committing referenced librarys, and some lint fixes