Fixed a few things and added reset ability for everything