trying to fix everything and improve