Expanding footer, minor changes, del unused lines