Fixed noted issues