little cleanup & fixed full history case