Draft Ball variant + some fixes, enhancements and code cleaning