fixed bugs in catalog and got display to work
merge
merge conflict
merge conflict
merge