final version 1.1 fixes