added more content - fix #227 fix #226 fix #216 fix #212