Many Minor Modifications