Simplified option handling and lots of tweaks