more tweaks, fixes, layout