Changed border definitions for DHBW compliance.
Small review changes.