Plugged some memory leaks and adjusted cell heights