rename working, small fixes