updated exercies, added solutions