calling congress: design improvements and logic fixes