add test content
add gitignore
various display changes/updates
Merge conflict fixes