Improved a few quick things as always