bugs in requiring and etc.. fixed