Improve several things