Major lisp related overhaul
Fix typo