updates
More bug fixes