Bugs have been fixed