updates to work with longpolling and pretty times