design tweaks.  also fixes #312 and #311