Fixed some Auto-Save and js Issues