Made libraries local, added defaults to #s