Parts Fixed

Re-Save bug stil exsts...