Fix missing variables. Labeled even more vars