finish

more changes