Fix #33
Fix #30

History hints
Fix #31