fixed it all!...kinda