Fixed some things and added more testing stuff