multiple bug fixes 1.1