fixed some comments and moved up onResume's