f_.augment comments added and cleanup