Use backticks for non-syntactic function names
Minor notes/fixes