sorted out some minimal faults