removed indefinite pause + some other bug fixes