task07 + fixes