added bugs deleted features