Fixing burst refill bug + refactoring supervisor for better readability