code refactoring, small improvements, settings started