added more labels, added RR and cleanup some code