merge and fix, added options