handle more type, corrected minor bugs
pyc