fixing everything to work better