mounds of changes and fixes