bug fixes
bug fixes
Working, need to run over night