more fixes for s-expressions