fixed it all, much better now