re-enable keywords, probably still broken but this is how far as I can get now