Wandered around the code base, fixed some stuff.