Fixed dependency issues. Filled holes

Fixed dependency issues with libraries