mostly styles changes and a 1-2 functional changes