Assets 2

Fixed dependencies from underlying libraries, and minor adjustments.