Add tweaks, fixes, and pure awesomeness