Added Stuffz and Cleaned up some code