reworked some troubles