Some new feature and bugfix