fixes due to cmnts