Small fixes
Add history feature