hopefully the last batch
minor problems with the total compile