bug fixes, V 1.1 for production