Fixes in 'core' and 'logic'.
Commenting placeholders for model, spacing and indentation fixes.