Fixes
Added solutions