cleaned/fixed problems