Some bugs detected and corrected...