Some bugs and 807 added