several misc design tweaks