Initial improvement in certain functions. This version is surely not ready for production but A2S_INFO should work properly on any env again.