Ver 2.0.1 bugfix and polishing