Updated

Deleted libraries, should be acquired separately.
Also some fixes.