design tweaks
many design fixes