Meteor update, added comments, lots of bugfixes