cleanup

cleanup, minor changes, have some bugs