Moved endpoint out into keys.xml, tidied up comments around this
Updated upcoming bills to allow them to handle ranged and indefinite upcoming-ness