+ minor adjustment
- rolled back the boundary convection (better to include the boundary in the schemes)