Improved build. Added libraries for future use.