Doc fix
SMF bugfix
APG support