Added null frame dumping, additional cleanup