little fix, adjustment
various adjustments
added settings structure
various small adjustments and cleanup