add some simple error handling
change headlines