Fixed not putting comments after plugin list, also reordered a couple things and add some things from pthrasher