forgotten files added and some bugs removed