updates & cleanup