Stephen Comments fixes