Bug fixes, perfomance update