added initial fixes