github comments and a couple more bugs