reorganize some things
move the keyword subs to xs
fix comparison