@version 2.1.0

fine tuning and some polishing