+fix bug, +features