Fixed some garbage collection issues, and added a little something something