fixed footer
second round of fixing
sync with master