last changes, idk, removing debug stuff maybe