fixing everything... half way there.