fixed horrendous things