Fix POD and add words