Some more updates & cleanup