add yaochuu and cleaned up a bit