some fixes, running in cloud ( yay fast! )