more features

and bug fixes