Finished adding Instutions plus some cleanup