Further Development and Bug fixing

Further Development and Bug fixing