Expanding options and cleaning up code (plus a quick fix)