Commented Code, Added Categories, Updated XML syntax