A few bugs have been fixed...