updated to react 12, many tuning changes