some more updates and organization