Added some error detecting
Added footer section