updates & fixed

updates & fixed