Big data test and some minor ug fixes