fixed footer, code clearup