add a hacky footer
merge in changes from maryam
Fix merge from maryam