added and fixed a few things. Now with options