Really fixed problems, testing now