added 1.1 features and bug fixes