some light editing of things