Added fixedprimary option and cleaned up formatting a bit. Fixes #28