That seems sufficient for time for the angels and for much to be done to try to end their enslavement. 

For the willpower limits I have little and less in mind at the moment for possible limitations. Might have something in time.