BUGFIX:
- inch-proofing here and there, to avoid later suprises.