Fixed some ERC issues; check Approved ERC for list of pending fixes