jenad: update, clean-up