Add keywords and fix description