restructured a bit and added some more content...