#63 Split up options, fixes issues