Code cleanup.
Fixed make targets.
Updated docs.