Bugs fixing in process..