Achieve stock integration & misc fixes