Some bug fixed and a test software which doensnt work correctly yet