Adding changes

bugfixes