feature and bug improvements