Some bugs have been fixed and efficiency has been improved