Moved from build to target.
Keyword clean up.
Updated badges.