b0b011d274
* need to merge before I conflict * more logging, and etc. * fix some mess * forgot the switch statement
* need to merge before I conflict * more logging, and etc. * fix some mess * forgot the switch statement