Bug Fix and new Options