Cleaned up constants and fixed packagesavemode