more markup changes, updated plugin, etc.