Small updates, added solution boxes
Minor updates