Continued trying to get Lineitems to work. Corrected some other files as well.