various improvements, acd.src etc