added solution to an exercise and some minir changes