a few more options implemented, as well as some smaller fixes