Improve boxes and check for goals