more updates, solifying design more