more improvements

yeeah men.