added a lot of ids and a couple of error messages