improving stuff a bit