Improved tab functionality, and other slight updates