fix options handling, ignore more