Working mainly on presentation. Fixed some erros