M'kay. Extra Castle Suffs have been added. 

Suggestions and feedback are GREATLY appreciated.