adding some comments and minor improvements for Amber module