Bug fixes and backup before adding options for external