Fixed some problems with id's. They can no longer be manually updated