Moved to tabs, added comments, a few more tests