bug fixes and the first final version