Added error stuff, updated report