Minor changes

Lower APM, timing changes, slight build order change