Finished assigning values and fixing errors