E0d/various fixes