layout fix
tweak
beginning read eval rewrite
more tweaks
more tweaks
merge