Reformat, fix NPE and add GC information to watch