added for convinience
a bunch of small fixes