Many Minor Fixes