Bugs been fixed