some final(?) changes