fixed feature bugs