Many things fixed