trying to fix some problems but we should check the smalltalk code too.