configuration fixed, imports fixed