Massive YOLO refactoring
Final tweaks