fixed the constants and file loading issues