Fixing minor problems and adding chapters