Ready to fire flag, also tidying