breaking added. minor fixes