bugs fixed, to be deployed