- fixed various faults