User:AGK/AE improvements