Add a 'check empty' option to flexitem settings, also refactor some variable names to make them less ambiguous and add some variable/method types