More Changes + Fixes