Backend improvements, few frontend changes.