Solutions 2_x corrections and Solutions 3_x implementation

Solutions 2_x refactored with great guru's corrections
Solutions 3_x implemented