Fixed Issues brought up in meeting