Some code clean and bugfixes