small fixes for regexps, documentation, removing keyword logic