Fixed some of what chris broke