Fixed stuff, but there's a memory leak!