fixed all the intial bugs