More keyword bottons added amd some other changes.