fixing bugs v1.1 for production