Added a few new things, + minor tweaks.