merged and small fix.