final content added, some tweaks