Remove special options (*slaps self*) and fixed some glitchies