fixed assembly conflict and a couple other issues