correcting many issues

changing the main tree