changed a number of things, handling options