bugs have been fixed...