Version 0.5 DEV Build 20
- Moved check's of old options around