Fixed smaller issues..