fixes on te tp risk expiration date
fixes and new db