some fixes in scm syntax