fixed some halt issues