more updates & clean ups