New features and error fixed

Also increase the performance