fixes out-of-date comments
fixes a bug where would not be loaded in the proper order