[prototype]A big update

Fixed various bugs in FN and OO