Some stupid bug fixes and improvements in keyword mathcing.