some changes
cleans up merge