Improvements from Thumper
Add hammer-tabs