Improved targets
Improved docs