shooter: more changes