Some indent formatting bugs and a fringe case fix for model.dimensions