Added latest bug fixes.