automatic entry name fix
various fixes