add more comments
add xfp sql
fix conflicts
fix typo
add rest of patrick\s files
upcase sql kws