bug fixes e tweaks no layout.