code cleanup, improved warn / crit speed parsing