Updating acf and small fixes