Pull request to fix many tickets and various cleanups

This fixes various different tickets and does a lot of cleanup related to Seattle files.