bug fixes; added helper classes