fixed some <=/<+- bugs