Fixed a typo
Tuning and bugfix