solutions to 1-2 without code are ready, some corrections