Fixes and bug changes

Too many to list!