reworked most files