Improved new last, bit of cleanup here and there