improvements in the error exposure chain, added todos