few fixes
base insert
Merge remote-tracking branch 'origin/master'