Made fixes per kevin's request.