little broken
Merge pull request #36 from mendyismyname/master

little broken
fixed some of the stuff I broke
Merge pull request #37 from mendyismyname/master

fixed some of the stuff I broke
updated merge conflicts, added tab helpers