Various changes after testing again after a long period of no use