finsihed with the bug fixes.