Fixed some errors caused by fatigue and lack of testing