Mostly Instapaper changes