Did some work and fixed some stuff.