Additional updates to some reporting stuff, cleanup, added more options