add content and wrap up major design issues