more silly improvements