Minor updates.
Merge branch 'origin/master'
remove private, fixed remove crash, better toString. #574