fixed some anomalies