added an exercise
better name for external presentation
many fixes