updates, slight restructuring