more updates, slight restructure