border colors, first steps at fixing bugs, some shortcuts -> lambdas