Add comments and hopefully fix #3