* updated to latest bug fixes