finish question 2

also comments to h files