added helpers
bug fixes