Integrate basics into introduction and some tweaks