some fixes(rd)+enhancements