#48 finish rights split validation and clean comments & todo