Still blowing up but minor fixes