Minor bug fix. Cleaned up the edit screen, removing some redundant options.