WIP, updated names of content types for nicer urls, mutliple bug and feature fixes