bigger-update

Added more options, fixed a few things.