finishing off basic rest stuff