Some bug fixes, added a footer