fixes
More content

Fix #16
Fix #21
Fix #23