Changed to use keywords instead of strings.
Content reorg and updates.