remove old bugs, added new ^_^