Added missing dependancies; fixed rr-'s stupidity