added cloud support
bug fixes