almost functional bubukan and some other minor changes