merged main and fixed small stuff