Added solutions and fixed some problems