testing and bug fixing and smoothening