Integrating tayfuns stuff and small fixes