CLISP porting and some other minor changes