improvements
more silly changes