Many Changes/Fixes