Made some edits... Also I made sure the changes affect the optimizer in f.m