removed stall detection since we have hard-limits now
merge; commented out broken stuff, initialized static doubles properly