fixin some other nonsense