Added packages & minor solution fixes