features and bug fixes