Touching up some stuff