[Nathan] Testing Main bug fixes