more changes

bug fixes..