Bogdan bug fixes
bug fixes
bug fixes + Catalin