some changes
some fixes, merging