Improvements! Yay!

Please merge this for your huge PR.