more changes, mainly in views