updated framework with minor fixes